XD-502 Delete a trigger from Shell

Merged code from 508 and ran regression test.