removes unnecessary code and comments
Merge pull request #1 from DomKM/master

removes unnecessary code and comments