Remove internal maps

Has Lorgan's GBGG2 as a dependency, so merge that first ;)