Merge pull request #28 from pradpnayak/GEP-52

Gep 52
--GEP-52, removed cruft