Remove unused macro
simplify error reporting