Clean up ResourceMappers
Clean up ResourceMappers