CONN-1279: PLEASE DO NOT MERGE.

Remove 'S' and updated class with Unsecured