Cleaned up concepts.

Change-Id: Ifba0889a6c063eecc172ec01db22582ac0bf38b1
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>