cleanup, remove lots of crap
Merge pull request #6 from dwradcliffe/cleanup

cleanup!