Remove unnecessary imports, move some to six

Towards #1699