add Xi.Imports && rm other imports and prefixes as needed