removing unnecesary code
Merge pull request #1200 from diegosarmentero/master

removing unnecesary code