Getting rid of unused imports