Flight path

Doing some cleanup