Remove unused imports and minor lint issues