Remove obsolete dependencies
Fix unit test