in the middle of cleaning remapping rules....