[build] More versioning cleanup