cleanup
make metadata implementation headers public