Remove logic from rc.vehicle_setup that resulted in redundantly setting the MAV_TYPE to the same initial default value set within the script.