remove unused/necessary code
Merge pull request #1484 from jjettenn/master

remove unused/necessary code