Remove *CONF defines as they are not really necessary and not supported on older versions