Merge "Unlink vnf from constants"