-- GEP-53, removed cruft
Merge pull request #91 from pradpnayak/GEP-50

-- GEP-53, removed cruft