Removing unneeded references to FieldPicker