Fix typos, remove unused imports