Cleanup some unused imports