Remove extraneous private declarations.
Issue #65, non-word characters, login and passcode.