Remove duplicate menu code