Merge pull request #91 from pradpnayak/GEP-50

-- GEP-53, removed cruft
--GEP-50, removed cruft and updated core file