airfluip1 cleanup and changes