GC: clean up public API as much as possible