fixup! Remove unnecessary UsernameCipher code

Address review feedback