Cutting some more wrong dependencies.