Remove some redundant keys