Add delete shell

* Add delete shell
* small bugfixes