Remove unused imports and fix few typos