Remove mdbd references