Pruned imports and improved map generation.