av: ...and more cleanups

Change-Id: Id2f6e484a21059c3ef707605d628b1ebeb4bff6a