More code cleanup if apf.cpp