Remove beforeSave method