Added cleanup.