Black River cleanup

Black River cleanup