Hm, Github doesn't allow me to comment on lines further up in this diff, but a lot of the imports are now unnecessary.