removed useless scan on destruction of an empty map, and fixed a misleading comment