logging cleanup part 2