Major cleanup on 1