Cleanup and bump version