logging cleanup part 1