more progress cleaning up new Depenednency support code