Cleanup of oeirnation estimators