Super Huge Code Cleanup and Inventory work.