Making one unified log file, cleanup