context_menus : code cleanup