some cleanup of apfMPAS