Cleanup code and bump version.