Removed some code and cleaned up bad design.