Got rid of some unused imports, curing some warnings.