Incremental improvement: Eliminate dcif dependency