remove some import statements
Merge branch '2.3.x'