Cleanup
Update version