Merge pull request #1 from jhaybie/Cleanup

Clean Clean!