Hotfix - reusing ACS token.
Minor cleanup changes.