cleanup/privatize