Remove error handling