Implemented remove option