Minor cleanups and enhancements

- remove unnecessary exports
- minor doc update