g2: cleanup and quiet logspam