- removed unnecessary code after the new model validation system