Major cleanup.