Minor cleaning.
EDB dependencies concept.