Ditched all the analysis storing code