added additional clean up