aaa: Fixup

Fixing some issues that were discovered during verification

Topic: AAA
Change-Id: I68f06bef0c4479e6c03ada0ace9c6b2128753949
Signed-off-by: Yair Zaslavsky <yzaslavs@redhat.com>
aaa: Cleanup

Removing unused code

Topic: AAA
Change-Id: I566c783520fefa8261b889a63b5b42c4198d1f01
Signed-off-by: Yair Zaslavsky <yzaslavs@redhat.com>