first part of removing redundant R<idToken>
check for window.Debug in logging
removed R<idToken usages where not needed