Orientation cleanup