template code cleaning; /all/ mains apps now use uniform roll-up; some cleaning in gannet and goose