Removed an unused import and corrected a typo

I don't know if I should have closed that PR, but this way seemed faster and easier to me.

This is a replacement for #2736