cleanup hack #if testing; don't export private member functions
cleanup use of PRIVATE (just in header)