Clean ups - added placeholder for the menu and commented code