diff --git a/matlab/kalman/likelihood/kalman_filter.m b/matlab/kalman/likelihood/kalman_filter.m
index 82aa74264b81345d3b3125ebf6a5916f178e3b84..941aa85aab273441eb1e9c96b4337b8ad2b68a8d 100644
--- a/matlab/kalman/likelihood/kalman_filter.m
+++ b/matlab/kalman/likelihood/kalman_filter.m
@@ -169,9 +169,8 @@ if t<last
 end
 
 % Compute minus the log-likelihood.
-if presample
-    if presample>=diffuse_periods
-        likk = likk(1+(presample-diffuse_periods):end);
-    end
-end
-LIK = sum(likk);
\ No newline at end of file
+if presample > diffuse_periods
+    LIK = sum(likk(1+presample-diffuse_periods:end);
+else
+    LIK = sum(likk);
+end
\ No newline at end of file
diff --git a/matlab/kalman/likelihood/kalman_filter_d.m b/matlab/kalman/likelihood/kalman_filter_d.m
index a39856c1a99ef5ba30e5ab4129bbcc206c6092fc..ea94ad30fa07073f840f40815bbc75b58b44825d 100644
--- a/matlab/kalman/likelihood/kalman_filter_d.m
+++ b/matlab/kalman/likelihood/kalman_filter_d.m
@@ -111,14 +111,4 @@ end
 dlik = dlik(1:s);
 dlik = .5*(dlik + pp*log(2*pi));
 
-if presample 
-    if presample>=length(dlik)
-        dLIK = 0;
-        dlik = [];
-    else
-        dlik = dlik(1+presample:end);
-        dLIK = sum(dlik);% Minus the log-likelihood (for the initial periods).
-    end
-else
-    dLIK = sum(dlik);
-end
\ No newline at end of file
+dLIK = sum(dlik(1+presample:end);
diff --git a/matlab/kalman/likelihood/missing_observations_kalman_filter.m b/matlab/kalman/likelihood/missing_observations_kalman_filter.m
index c478e0a099d48f90dd179ed111364bfb6653a54b..d7f118e8b965eae418c2572a465c91e2cb0889b3 100644
--- a/matlab/kalman/likelihood/missing_observations_kalman_filter.m
+++ b/matlab/kalman/likelihood/missing_observations_kalman_filter.m
@@ -139,9 +139,8 @@ if t<last
 end
 
 % Compute minus the log-likelihood.
-if presample
-    if presample>=diffuse_periods
-        lik = lik(1+(presample-diffuse_periods):end);
-    end
-end
-LIK = sum(lik);
\ No newline at end of file
+if presample>=diffuse_periods
+    LIK = sum(lik(1+presample-diffuse_periods:end));
+else
+    LIK = sum(lik);
+end
\ No newline at end of file
diff --git a/matlab/kalman/likelihood/missing_observations_kalman_filter_d.m b/matlab/kalman/likelihood/missing_observations_kalman_filter_d.m
index b500e964e170ea006f1b23fc6a32a6f0d698abca..4e0ae990fffa5a4068cf0e5dd7158ddd1158168d 100644
--- a/matlab/kalman/likelihood/missing_observations_kalman_filter_d.m
+++ b/matlab/kalman/likelihood/missing_observations_kalman_filter_d.m
@@ -125,14 +125,4 @@ end
 
 dlik = .5*dlik(1:s);
 
-if presample 
-    if presample>=length(dlik)
-        dLIK = 0;
-        dlik = [];
-    else
-        dlik = dlik(1+presample:end);
-        dLIK = sum(dlik);% Minus the log-likelihood (for the initial periods).
-    end
-else
-    dLIK = sum(dlik);
-end
\ No newline at end of file
+dLIK = sum(dlik(1+presample:end));
diff --git a/matlab/kalman/likelihood/univariate_kalman_filter.m b/matlab/kalman/likelihood/univariate_kalman_filter.m
index 4aadb5e8d1ee4adce2e272fb4633f99bab8a84f2..d3e3d54837d64ae9ce5d1367a5e5eb335ea31938 100644
--- a/matlab/kalman/likelihood/univariate_kalman_filter.m
+++ b/matlab/kalman/likelihood/univariate_kalman_filter.m
@@ -167,9 +167,8 @@ if t<last
 end
 
 % Compute minus the log-likelihood.
-if presample
-    if presample>=diffuse_periods
-        lik = lik(1+(presample-diffuse_periods):end);
-    end
-end
-LIK = sum(lik);
\ No newline at end of file
+if presample > diffuse_periods
+    LIK = sum(lik(1+presample-diffuse_periods:end));
+else
+    LIK = sum(lik);
+end
\ No newline at end of file
diff --git a/matlab/kalman/likelihood/univariate_kalman_filter_d.m b/matlab/kalman/likelihood/univariate_kalman_filter_d.m
index e6e7c22101d705a3a46a6fb3bd75ac9c664f750d..ae5b2baaf2322f8d723bb3063d36cc4d3b2f6072 100644
--- a/matlab/kalman/likelihood/univariate_kalman_filter_d.m
+++ b/matlab/kalman/likelihood/univariate_kalman_filter_d.m
@@ -164,16 +164,4 @@ end
 dlikk = .5*dlikk(1:s);
 llik  = .5*llik(1:s,:);
 
-if presample
-    if presample>=length(dlikk)
-        dLIK = 0;
-        dlikk= [];
-        llik = [];
-    else
-        dlikk= dlikk(1+presample:end);
-        llik = llik(1+presample:end,:);
-        dLIK = sum(dlikk);% Minus the log-likelihood (for the initial periods).
-    end
-else
-    dLIK = sum(dlikk);
-end
\ No newline at end of file
+dLIK = sum(dlikk(1+presample:end));