* Some cleanup
* Bump version