remove error handling