continued cleanup of ControlDroneActivity