Merge ds-container-remove.sh into ds-remove.sh

Merge ds-container-remove.sh into ds-remove.sh #1890