Got rid of some warnings from extra imports