Remove some obsolete fields