Additional EE version cleanup