Remove error handling code