Clean up properly at the end of each run and don't re-calculate topics every time
Release 2.6.2