Better cleanup.