Revert "Mapping of dependencies to internal object"

This reverts commit 05ad5dfebdaf396299f7d3ba1fee1cee2fed0a1d.