Hero code clean up

Mostly removal of old code