That's a good question but beats the point of this PR. In reality, all those should just go away and we should use the SDK directly. Just some cleanup that needs to happen at some point but no rush.