LAI-20 cleanup