Cleaning up for a pull.

Cleaning.

Clean.
Restored mistaken removal of br_get_metadata_string