LOGGING cleanup