CONN-512 cleanup comments