remove some error handling for now