Removed dependence on external lattice calculator