CPF generator clean up