Cleaning unused imports up