eliminate some commits after v3.0