Cleanup some code, starting the heirarchy.