Updates to remove function