move some occurences of require to import