Comment unused code, removed navbar