NEXUS-6027: Cleanup after removal of EIs