Revert "More work on 2.0"

This reverts commit 3570fc95184895891bcfa1920d82ef960cfc40e2.
Revert "GPX 2.0-alpha"

This reverts commit 687ea2bb64d17f92c1fd3bcebd8cfc021be79e58.