Remove old thread handler