Reliability improvement in the remove subcommand.