removed if else from remove and add methods