Revert "Cleanup"
Merge pull request #2 from jameskolce/revert-1-cleanup

Revert "Cleanup"