reference 2.2 maps, and remove (so far unused) support-v4