Get rid of optional dependencies. Step 2