Get rid of obsolete field checking