Fix extra imports