More cleanup and logging messages