Cleaned up lattice,stl and token related files