cleanup versioning code & ensure we perfadillianize metrics