Cleanup. Fix rotation on hold when empty