Remove old menu code