VehicleLogic: Cleanup