Remove cv defines