[Debug] cleanup interfaces before 2.5-final
[Debug] UniversalErrorHandler