removing some unused code
Merge pull request #531 from kubabrecka/unused_code

removing some unused code