more cleanups
remove mbf_feature flag