[subset] Add TODO item
Remove old and rusty Mac/ stuff
Merge remote-tracking branch 'upstream/master'