Remove unused stuff
Update README
Merge master