Remove obsolete fields