Cleanup

Removing some "musing" based models that haven't panned out, and
clearer file names.