Remove redundant import
Fix nullable