Removing some functions
Minor cleanup
Update README.md