Clean up more stuff.
Merge pull request #4 from ahb108/4thtinker

Clean up more stuff.