very minor: cleanup in CFA