Clean up remaining throwError invocations