diff --git a/src/main/java/eu/webeid/example/config/ValidationConfiguration.java b/src/main/java/eu/webeid/example/config/ValidationConfiguration.java
index 26c6e0e..f1f78f7 100644
--- a/src/main/java/eu/webeid/example/config/ValidationConfiguration.java
+++ b/src/main/java/eu/webeid/example/config/ValidationConfiguration.java
@@ -126,15 +126,11 @@ public X509Certificate[] loadTrustedCACertificatesFromTrustStore() {
     @Bean
     public AuthTokenValidator validator() {
         try {
-            AuthTokenValidatorBuilder validatorBuilder = new AuthTokenValidatorBuilder()
+            return new AuthTokenValidatorBuilder()
                     .withSiteOrigin(URI.create(yamlConfig().getLocalOrigin()))
                     .withTrustedCertificateAuthorities(loadTrustedCACertificatesFromCerFiles())
-                    .withTrustedCertificateAuthorities(loadTrustedCACertificatesFromTrustStore());
-            if (activeProfile.equals("dev")) {
-                // Enable support for ESTEID 2015 test certificates in development profile.
-                validatorBuilder = validatorBuilder.withNonceDisabledOcspUrls(URI.create("http://aia.demo.sk.ee/esteid2015"));
-            }
-            return validatorBuilder.build();
+                    .withTrustedCertificateAuthorities(loadTrustedCACertificatesFromTrustStore())
+                    .build();
         } catch (JceException e) {
             throw new RuntimeException("Error building the Web eID auth token validator.", e);
         }
diff --git a/src/main/resources/certs/dev/TEST_of_ESTEID-SK_2015.cer b/src/main/resources/certs/dev/TEST_of_ESTEID-SK_2015.cer
deleted file mode 100644
index 7749286..0000000
Binary files a/src/main/resources/certs/dev/TEST_of_ESTEID-SK_2015.cer and /dev/null differ
diff --git a/src/main/resources/certs/prod/ESTEID-SK_2015.cer b/src/main/resources/certs/prod/ESTEID-SK_2015.cer
deleted file mode 100644
index b166955..0000000
Binary files a/src/main/resources/certs/prod/ESTEID-SK_2015.cer and /dev/null differ