Completed merge change for flight tracks.
Removed some configuration options to make it less busy.