Different way of cleaning map.
Fixes #455