Removed optional dependencies