Clean up some random stuff

Fixes Issue #10 - as well as cleaning up some unnecessary files and some other random tidbits.