Minor cleanups. Disabling preflight_check for now. Use rcS1 for quadrotor and rcS2 for fixedwing