cleanup and bump versions