Initial commit for remove function