refactoring + removed all dead letter messages