Finish cleanup of AVRGRP and AVRALL