Removed unneeded eclasses