diff --git a/configure.ac b/configure.ac
index 2cfaa8a0..f2a39bc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,8 +196,7 @@ AC_ARG_ENABLE([rdkcertselector],
         AS_HELP_STRING([--enable-rdkcertselector],[enables rdkcertselector replacement (default is no)]),
         [
           case "${enableval}" in
-           yes) IS_LIBRDKCERTSEL_ENABLED=true
-                LIBRDKCERTSEL_FLAG=" -DLIBRDKCERTSEL_BUILD ";;
+           yes) IS_LIBRDKCERTSEL_ENABLED=false ;;
            no)  IS_LIBRDKCERTSEL_ENABLED=false ;;
           *) AC_MSG_ERROR([bad value ${enableval} for --enable-rdkcertselector]) ;;
            esac
diff --git a/source/protocol/http/curlinterface.c b/source/protocol/http/curlinterface.c
index b16aca49..f8579dfb 100644
--- a/source/protocol/http/curlinterface.c
+++ b/source/protocol/http/curlinterface.c
@@ -470,11 +470,6 @@ T2ERROR sendReportOverHTTP(char *httpUrl, char *payload, pid_t* outForkedPid)
                         pCertFile += (sizeof(FILESCHEME) - 1);
                     }
 #endif
-                    if (pCertPC == NULL)
-                        T2Error("%s : passcode is NULL\n",__func__);
-                    if (pCertURI == NULL)
-                        T2Error("%s : cert URI is NULL\n",__func__);
-                    T2Info("%s: pCertPC size = %d\n",__func__,sizeof(pCertPC));
                     if((mtls_enable == true) && (setMtlsHeaders(curl, pCertFile, pCertPC, &childCurlResponse) != T2ERROR_SUCCESS))
                     {
                         curl_easy_cleanup(curl); // CID 189985: Resource leak