cleanup and some other things

Change-Id: Ia0c6eec2668071a5b87b530bfd00cfe3a88c0054
remove menu folder

Change-Id: Ie157737f707282685234f408a2a249ee35c4a41c