unifying remove and add forms