Remove some redundant imports
Simplification following key-entity merge.