Stupid but working cleanup on rotation