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

Remove agent