Revert "Removing rest of dependencies"

This reverts commit 0190a78a8770bd0af4504994a556ab1a13b7b639.