Kill model if cross-sections fail, plus some cleanup of cross.cxx