Fix failed merge. Cleanup empty save logic.