Cleanup; Update DPF