logging cleanup part 3