Kill some crappy "failFunction" stuff, marked as old in r14625