cleanup deps and imports [ci skip]