Remove entry when viewer/mt are discarded (see #10527)
Remove entry when importer/editor are discarded (see #10527)
Merge pull request #927 from jburel/rebased/develop/remove-agent

Remove agent (rebased onto develop)