Remove submission error received + other refactoring

best reviewed commit-by-commit