fix: handleRemove