remove error handling code