Revert "Adding Client ID to samples app, improving default flow"

This reverts commit a0154d858e3f72a36c2e01efa62feb189e9466e1.