Remove references to ef