Connection Strings pt2

Looks like my Git GUI didn't refresh. These are some more changes I made
to connection strings / commenting out obsolete or problem code, that
should have been included in the last commit.