Cleanup before 1 1