Updating readme.

Also some small cleanup of unused stuff.