Dropped the redundant code from FieldWizard