Remove redundant imports and dependency