Removed unused inputs. Removed the code for the menu.
Merge remote-tracking branch 'origin/master'