Refactoring of Remove
ModelAttributeVisitior Fix