Last minute EE cleanups