Added more dependency reduction.