Better cleanup on destroy.