Merge pull request #169 from skyluc/issue/removed-deprecated-imports

Fixes some deprecated imports
Fixes more deprecated imports