Cleanup unneeded cpdefs and public declarations.

Per Stefan's comment these are unneeded and actually the tests still pass.