Partial updates to remove static aabService object as we are string the currentToken now.