Autonomous mode cleaned up