Remove extra unneeded return, and unused noop func.
Cleanup handler hierarchy