Delete stuff.
Clean up.
Merge pull request #7 from rhuang/master

Clean up stuff that we shouldn't commit.