Getting rid of Edict, see commit message in Master