Clean up of logging