cleanup other usage of 2D dictionary