Worked on remove function