Remove old import targets
Merge pull request #833 from lothrop/3.5

Fix import targets for Unified API