Clean up the versioning scheme