Remove some debug statements from the menu code

Change-Id: I1e9e7219bf58af2c823b925035f370a371d32287
Merge branch 'remove-debug'

Change-Id: I406dd2aac1084393215e1244afd04ca218ef8a6e