Stop exporting so many internals. Remove some dead code