Clean up instrument version build method