remove dictionary-map and dictionary-for-each