More versioning cleanup