CRITICAL: Removing USER.currentContext