cleanup after splitting from xlattice_go