Removed deprecated code
Slight updates to README.md