They need to stop focusing on grooming one guy like they did with Cena and groom multiple stars. That was what caused the issues in the first place.

Check out the pilot for my webshow WISHFUL THINKING. It is a show about a college student who fucks up his day and a Genie grants him the opportunity to do it all over again and he finds new and creative ways to fuck it up even more.