His last great singles match happened in 2015 vs Roman at HiaC. After that, there was a decent tag stint with Orton, and a sneaky good tag run with Matt Hardy, of all people. You can't have spoopy bullshit take center stage all the fucking time because they do not translate well to the main event. Even Taker, who was a literal dead man early on, had to put his working boots every now and then.