ATC: Added support for removing from the context menu