Avi clean up1