remove dictoinary-for-each and dictionary-map