Fix wrong merge, remove field_lib dependency