Got rid of some dependency