remove functions updated