remove debug error handler code
change namespace