Get rid off more unused dependency