remove original widget registration
move towards the bottom of the class, comments, misc housekeeping