clean up and bump version;