remove unnused methods and other random improvements
let's actually use this method
Merge pull request #843 from adrianob/random_fixes

remove unnused methods and other random improvements