Fixed some warnings from extraneous imports