Revert "Revert "Removed old dependencies""

This reverts commit db867161a028e1b4254c7dce0629af922b40b3d9.