Cleanup commented ConnectionHelper code