Removed references to old CLP.Models