Basic refactoring: removing all commented out / unused code

[bajancode]

Once other pull requests have been improved, removing unneeded commented out text and unused code, such as the nav bar