eliminator ed15 refactor