remove unnecessary code from staticpagescontroller
fix merge conflicts front page
fix merge conflicts