Merge pull request #138 from pvcarrera/master

Remove unused code