Revert "New dependencies Fixes #234"

This reverts commit 592f583b437540fded6e892cae9f8b08e4ab1a31.