Clean up unnecessary or confusing logging