Remove unnecessary code
Merge branch 'master' of github.com:zachcannon/DefenseOfTheCode