Removed refs to context menu