More logging and clean up.