#141 rip out the escalator thread code