Remove leftover bits of old menu setup