removed jedi
reordering conf