Clean menu helper code.

Change-Id: I8c009ad9c340d7267e9d1cf43b6fc1513d44eb21
3 files changed