More cleanup
Update README