Remove some unused imports
Merge pull request #2570 from spillevink/remove_unused_stuff

Remove some unused imports