Clean up versioning mess