Remove references to lattice