Cleaning up analytics role classes

Change-Id: I3ab3d1cc7d3c5a99ae00096d1499a56d7bb9cf3f