cleanup old code with emails
Merge pull request #1 from phobos101/master

Did some cleanup