clean up and fix some 2-2-stable templates