Remove dependencies from now extracted modules