AZ-31 Strip out unused lines