Removed static dictionaries