restoring functionality omitted during the branch update.
code cleanup.
Matching functionality in current master. Updated the code so that 'takeoff' commands are not displayed on the map.