Cleanup unneeded code.
Update README