Clean up superfluous error handling code.