Clean up some unused imports