Removing these should fix the KeyErrors