Removed references to NotImplementedException