cleanup
autopilot tweak