Cleaning up HCUAV controller