Remove forked definitions and add first definitions for ELitEd