Please remove these changes. The imports are not used (and generate compiler warnings), and removing these will make the PR a bit less complicated.