remove some tweak for stability