Cleanup & refactoring.

Removed unused code.  Refactored navdata option parsing a little.
Parse raw measures navdata option.