More cleanup of unused imports