removing unused code
Merge pull request #1726 from diegosarmentero/master

removing unused code