Bump version

and cleanup