Kill dead import
Fix completion text