Add changes missed from last commit.
Remove optional dependencies from setup.py.