Move remove method to the model classes