cleanup and versioning