Remove unnecessary imports, move some to six