Some cleanup of E3X