Support --remove