PFS-864 #comment cleanup up
Logging
Changed order of connect