Pass VSMap out to set error in constructing RemoveDirt data. Other changes as well.