cleanup and version