jwheare Clean up logging