Cleanup AV

Signed-off-by: Jithin Jose <jithin.jose@intel.com>