1.3.3: Major cleanup