Major Update and Cleanup

Removed several files that are no longer useful and generally cleaned
up some other files