cleanups, was thinking about running this for some old data again