Unnecessary import left after rebasing