Finally fixed removal of CAF additions