Fix typos, Remove unused imports