Remove a cheat, and reorganise