Refactor: Continued dismantling the old "refresh" subsystem