Remove unneeded FieldDataEstimator class

Also fixes the wording in a few comments as well as substituting an
assertion instead of an if/else clause.