Maps tool cleanup