remove obsolete error handling