Removed legacy fields