Removed estimator support