Merge "Further cleanup for rotation code"