Further clean up of bnd repo