Cleaned up junk.
Merge pull request #2 from chriswoodrich/clean_up

Cleaned up junk.