Remove unused imports
Use new lattice library