Merge "Remove wfDl() and cleanup everything it touched"