Cleanup, un-export almost all public members