started working on the remove function