fixed AVs, added data cleanup