Correct resetMap & clean