diff --git a/conf/netdata b/conf/netdata
index 57922163..583bcb2c 100644
--- a/conf/netdata
+++ b/conf/netdata
@@ -61,11 +61,8 @@ export NETDATA_GO_D_CONF_DIR="${NETDATA_CONF_DIR}/go.d"
 export NETDATA_GO_D_CONF_PHPFPM="${NETDATA_GO_D_CONF_DIR}/phpfpm.conf"
 export NETDATA_GO_D_CONF_NGINX="${NETDATA_GO_D_CONF_DIR}/nginx.conf"
 export NETDATA_GO_D_CONF_MYSQL="${NETDATA_GO_D_CONF_DIR}/mysql.conf"
-
-# Plugin config files.
-export NETDATA_PYTHON_D_CONF_DIR="${NETDATA_CONF_DIR}/python.d"
-export NETDATA_PYTHON_D_CONF_PGSQL="${NETDATA_PYTHON_D_CONF_DIR}/postgres.conf"
-export NETDATA_PYTHON_D_CONF_OPENLDAP="${NETDATA_PYTHON_D_CONF_DIR}/openldap.conf"
+export NETDATA_GO_D_CONF_OPENLDAP="${NETDATA_GO_D_CONF_DIR}/openldap.conf"
+export NETDATA_GO_D_CONF_PGSQL="${NETDATA_GO_D_CONF_DIR}/postgres.conf"
 
 # Database
 # NETDATA_DB_PASSWD is generated in dialog/optional_components.sh.
diff --git a/functions/netdata.sh b/functions/netdata.sh
index 4f72ae5d..270ceaac 100644
--- a/functions/netdata.sh
+++ b/functions/netdata.sh
@@ -72,12 +72,6 @@ netdata_config()
 
     if [ X"${DISTRO}" == X'FREEBSD' ]; then
         perl -pi -e 's#( *memory mode =).*#${1} save#g' ${NETDATA_CONF}
-
-        # FreeBSD doesn't have Go plugins, have to use Python plugins instead.
-        perl -pi -e 's/^(web_log: no)/#${1}/' ${NETDATA_PYTHON_D_CONF}
-        perl -pi -e 's/^(nginx: no)/#${1}/' ${NETDATA_PYTHON_D_CONF}
-        perl -pi -e 's/^(phpfpm: no)/#${1}/' ${NETDATA_PYTHON_D_CONF}
-        perl -pi -e 's/^(mysql: no)/#${1}/' ${NETDATA_PYTHON_D_CONF}
     fi
 
     perl -pi -e 's#PH_NETDATA_PORT#$ENV{NETDATA_PORT}#g' ${NETDATA_CONF} >> ${INSTALL_LOG} 2>&1
@@ -101,7 +95,7 @@ netdata_module_config()
 {
     ECHO_DEBUG "Generate config files for plugins."
 
-    mkdir -p ${NETDATA_GO_D_CONF_DIR} ${NETDATA_PYTHON_D_CONF_DIR} &>/dev/null
+    mkdir -p ${NETDATA_GO_D_CONF_DIR} &>/dev/null
 
     # go.d modules: phpfpm, nginx.
     cp -f ${SAMPLE_DIR}/netdata/go.d/phpfpm.conf ${NETDATA_GO_D_CONF_PHPFPM} >> ${INSTALL_LOG} 2>&1
@@ -111,9 +105,9 @@ netdata_module_config()
     if [ X"${BACKEND}" == X'OPENLDAP' ]; then
         ECHO_DEBUG "Generate ${NETDATA_PYTHON_D_CONF_OPENLDAP}."
 
-        cp -f ${SAMPLE_DIR}/netdata/python.d/openldap.conf ${NETDATA_PYTHON_D_CONF_OPENLDAP} >> ${INSTALL_LOG} 2>&1
-        perl -pi -e 's#PH_LDAP_BINDDN#$ENV{LDAP_BINDDN}#g' ${NETDATA_PYTHON_D_CONF_OPENLDAP} >> ${INSTALL_LOG} 2>&1
-        perl -pi -e 's#PH_LDAP_BINDPW#$ENV{LDAP_BINDPW}#g' ${NETDATA_PYTHON_D_CONF_OPENLDAP} >> ${INSTALL_LOG} 2>&1
+        cp -f ${SAMPLE_DIR}/netdata/go.d/openldap.conf ${NETDATA_GO_D_CONF_OPENLDAP} >> ${INSTALL_LOG} 2>&1
+        perl -pi -e 's#PH_LDAP_BINDDN#$ENV{LDAP_BINDDN}#g' ${NETDATA_GO_D_CONF_OPENLDAP} >> ${INSTALL_LOG} 2>&1
+        perl -pi -e 's#PH_LDAP_BINDPW#$ENV{LDAP_BINDPW}#g' ${NETDATA_GO_D_CONF_OPENLDAP} >> ${INSTALL_LOG} 2>&1
     fi
 
     # MySQL & PostgreSQL
@@ -147,19 +141,18 @@ EOF
 CREATE USER ${NETDATA_DB_USER} WITH ENCRYPTED PASSWORD '${NETDATA_DB_PASSWD}' NOSUPERUSER NOCREATEDB NOCREATEROLE;
 EOF
 
-        ECHO_DEBUG "Generate ${NETDATA_PYTHON_D_CONF_PGSQL}."
-        backup_file ${NETDATA_PYTHON_D_CONF_PGSQL}
-        cp -f ${SAMPLE_DIR}/netdata/python.d/postgres.conf ${NETDATA_PYTHON_D_CONF_PGSQL} >> ${INSTALL_LOG} 2>&1
-        perl -pi -e 's#PH_NETDATA_DB_USER#$ENV{NETDATA_DB_USER}#g' ${NETDATA_PYTHON_D_CONF_PGSQL} >> ${INSTALL_LOG} 2>&1
-        perl -pi -e 's#PH_NETDATA_DB_PASSWD#$ENV{NETDATA_DB_PASSWD}#g' ${NETDATA_PYTHON_D_CONF_PGSQL} >> ${INSTALL_LOG} 2>&1
+        ECHO_DEBUG "Generate ${NETDATA_GO_D_CONF_PGSQL}."
+        backup_file ${NETDATA_GO_D_CONF_PGSQL}
+        cp -f ${SAMPLE_DIR}/netdata/go.d/postgres.conf ${NETDATA_GO_D_CONF_PGSQL} >> ${INSTALL_LOG} 2>&1
+        perl -pi -e 's#PH_NETDATA_DB_USER#$ENV{NETDATA_DB_USER}#g' ${NETDATA_GO_D_CONF_PGSQL} >> ${INSTALL_LOG} 2>&1
+        perl -pi -e 's#PH_NETDATA_DB_PASSWD#$ENV{NETDATA_DB_PASSWD}#g' ${NETDATA_GO_D_CONF_PGSQL} >> ${INSTALL_LOG} 2>&1
     fi
 
     write_iredmail_kv "sql_user_${NETDATA_DB_USER}" "${NETDATA_DB_PASSWD}"
 
-    chown -R ${SYS_USER_NETDATA}:${SYS_GROUP_NETDATA} ${NETDATA_GO_D_CONF_DIR} ${NETDATA_PYTHON_D_CONF_DIR}
-    chmod 0755 ${NETDATA_GO_D_CONF_DIR} ${NETDATA_PYTHON_D_CONF_DIR}
+    chown -R ${SYS_USER_NETDATA}:${SYS_GROUP_NETDATA} ${NETDATA_GO_D_CONF_DIR}
+    chmod 0755 ${NETDATA_GO_D_CONF_DIR}
     chmod 0400 ${NETDATA_GO_D_CONF_DIR}/*.conf &>/dev/null
-    chmod 0400 ${NETDATA_PYTHON_D_CONF_DIR}/*.conf &>/dev/null
 
     echo 'export status_netdata_module_config="DONE"' >> ${STATUS_FILE}
 }
@@ -201,7 +194,6 @@ netdata (monitor):
         - Main config file: ${NETDATA_CONF}
         - Modified modular config files:
             - ${NETDATA_GO_D_CONF_DIR}
-            - ${NETDATA_PYTHON_D_CONF_DIR}
     - HTTP auth file (if you need a new account to access netdata, please
       update this file with command like 'htpasswd' or edit manually):
         - ${NETDATA_HTTPD_AUTH_FILE}
diff --git a/samples/netdata/go.d/openldap.conf b/samples/netdata/go.d/openldap.conf
index 848077a5..cea4c348 100644
--- a/samples/netdata/go.d/openldap.conf
+++ b/samples/netdata/go.d/openldap.conf
@@ -1,5 +1,3 @@
-{{ ansible_managed | comment }}
-
 jobs:
   - name: local
     url: ldap://127.0.0.1:389
diff --git a/samples/nginx/templates/netdata.tmpl b/samples/nginx/templates/netdata.tmpl
index 0e387e33..d01673be 100644
--- a/samples/nginx/templates/netdata.tmpl
+++ b/samples/nginx/templates/netdata.tmpl
@@ -1,8 +1,9 @@
 # Running netdata as a subfolder to an existing virtual host
 # FYI: https://github.com/firehol/netdata/wiki/Running-behind-nginx
 
-location = /netdata {
-    return 301 /netdata/;
+# Skip the splash and cloud login screen.
+location ~* /netdata/*$ {
+    return 301 /netdata/v3;
 }
 
 location ~ /netdata/(?<ndpath>.*) {