Clean up imports
FIX expansion of simple entities