Performance improvement.
Performance improvement: remove some maps.