Split user and admin cleanup to 2 separate classes

Partially implements: blueprint benchmark-context-cleanup-refactor
Change-Id: I3ba0deeb5a2793b8c45f6160fe0eda22250a1ece
Merge "Split user and admin cleanup to 2 separate classes"