Remove redundant imports
Sort imports consistently