Use `--remove` consistently