change to remove function