TS update

Moving SimpleTs into TargetSelector, they do the exact same thing pretty much.