Revert deletion of NormalRules to avoid a leak.
Fix leak with deletion of DepGraph.