removed useless code
added support for re-setting a sponate mapping