BUG: Remove more unused imports