further cleanup of efield lib