diff --git a/rsyslog/common.sls b/rsyslog/common.sls
index e597163..328fc81 100644
--- a/rsyslog/common.sls
+++ b/rsyslog/common.sls
@@ -1,4 +1,4 @@
-{%- from "rsyslog/map.jinja" import client,server,common with context %}
+{%- from "rsyslog/map.jinja" import common with context %}
 
 {%- if common.enabled %}
 
diff --git a/rsyslog/files/rsyslog.default.conf b/rsyslog/files/rsyslog.default.conf
index 4aef7e7..6256e8c 100644
--- a/rsyslog/files/rsyslog.default.conf
+++ b/rsyslog/files/rsyslog.default.conf
@@ -39,7 +39,7 @@
 
 $IncludeConfig {{ common.rsyslog_d }}/*.conf
 
-{% if common.format is defined %}{% if common.format is defined %}
+{% if common.format is defined %}
 $template {{ common.format.name }},{{ common.format.template }}
 $ActionFileDefaultTemplate {{ common.format.name }}
 {% else %}