remove unused code
Merge pull request #2194 from xavfernandez/xfernandez/dead_code

remove unused code