added support for --remove