Remove unused import
Fix comparison with None