Clean and fix aspa_elig and asi_elig