Menu legacy cleanup