Comment out better logging