major cleanup, overhaul for 2.7.0, removed bunk template