FilteringMapSerializer cleanup