Removed more optional dependencies.