Cleanup of orbit-circular