remove some unnecessary modules and fix some import bugs