Removal of stack watcher stuff from thread.{h/c}pp