enhancements to remove command