Get rid of esutils
Settings unification