Simplify access control classes [#66904450]

Signed-off-by: Phan Le <ple@pivotallabs.com>