Implemented TODO in CoreService

    The todo:
    // TODO: remove this. we never set threadPool to null

    The fix:
    Removed most code that would be executed if threadPool were null
    Reordered a little logic to make code easier to read