Added back in remove function