EL Compatibility, cleanup