Removed superfluous ContextMenu code