more cleanups of APP APS and more filling in of APP APC