Remove more cm and fix derp