Fix for log clean up