fixed several lint errors and removed unused code
removed unused menu xmls