CXX-214 Remove libdeps from driver build

Also a drive by fix for CXX-215