Better cleanup between runs