Working on remove function