- Clean up of SubsumerHiearchy code