Misc, remove comments on internal API
Revert internal API changes; fix build