Added the --remove option