moved these to e4e-tools