Purge unnecessary code
Merge pull request #1 from sanmiguel/develop

Purge unnecessary code