Fixes more deprecated imports
Merge pull request #170 from skyluc/issue/removed-deprecated-imports

Fixes more deprecated imports