Better cleanup on finish