further clean up logging