Clean up redundant inline and linkThreads