started working on remove function