Design Overhaul Cleanup