Revert "clean up & make public"

This reverts commit 49af2f4e7d3fad3b1b6df734e0cffebf1d1b639b.