CFA code cleanup.