Made the default GF implementation aring-m2-gf.  Moved, deleted unneeded code.