Removes some more unused imports that were found with pylint. I don't *think* this breaks anything but I'll be interested to see what the CI systems say