removing unused page templates, fixing up some other templates