Cleaning up logging