Remove unused struct member
Further isolate Linux specific code
Begin thread code isolation