More GMail cleanup.