They shouldn't have had Brawl For All.
Just have him destroy jobbers, and JR manage him on the sly (while pretending to be an impartial commentator).
Just as JR's jig seems up (blatantly removing the headset and interfering in a title match), he cuts a bragging and heelish promo with the man by his side, to prove that he is indeed managing (for the money).
After explaining that a seasoned Japanese veteran like Steve Williams "will destroy anyone," Dr. Death hits him a couple of stiff punches, and makes a statement with his Lethal Dose finisher:
He doesn't need a manager, he'll keep making money, and this time - keep it all to himself. Makes a splash in the upper card, settles in the mid card, fin.