Merge "Remove TokenRequirement as it's not useful anymore"