ak-api - working on system groups for activation keys

ak-api - clean up based on pull-request comments