removed some unnecessary mutable dictionaries