minor cleanup, map-only processing