ATC: Added support for removing with the context menu