Fix up some unused imports