Clean up imports (taken from PR #1804)
Merge pull request #1843 from dagwieers/import-cleanup

Clean up imports (taken from PR #1804)