More cleaning on src/field.c