Cleaning up berks/metadata dependencies

Change-Id: I5a24fbbe8c5bb33646fcffd83971ce4fe982a14c