Clear unused Dictionary fields

No easy answer