Cleanup, and remove the file format for now until the single, unified format
is finalized...
Properly handle instrument changes...