removed explicit editing of context/receivers/fields ordering