Refactoring: removed classes, that are not needed for error-handling