Almost done with remove function