Refactor code (remove redundant imports)