Removal of unused imports