Clean up rotation logic and remove unnecessary logic