Cleanup of VCF precleaning normalize code to improve performace by avoiding unnecessary lookups