develop
diff --git a/heka/files/decoder/openstack.toml b/heka/files/decoder/openstack.toml
deleted file mode 100644
index 16fa1f0..0000000
--- a/heka/files/decoder/openstack.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[OpenStackDecoder]
-type = "MultiDecoder"
-subs = [ 'OpenStack','OpenStackTrace' ]
-#cascade_strategy = "all"
-cascade_strategy = "first-wins"
-log_sub_errors = false
-
-[OpenStack]
-type = "PayloadRegexDecoder"
-match_regex = '^(?P<timestamp>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}.\d{3})\s(?P<pid>\d+)\s(?P<severity>\w+)\s(?P<programname>\D+)\s\[(?P<id>.+)\]\s(?P<payload>.*)'
-timestamp_layout = "2015-10-06 11:34:37.243"
-
-[OpenStackTrace]
-type = "PayloadRegexDecoder"
-match_regex = '^(?P<timestamp>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}.\d{3})\s(?P<pid>\d+)\s(?P<severity>TRACE)\s(?P<programname>.\S+)\s(?P<Payload>.*)'
-timestamp_layout = "2015-10-06 11:34:37.243"
-
-[OpenStack.message_fields]
-type = "OpenstackLogFile"
-logger = "%programname%"
-pid = "%pid%"
-Payload = "%payload%"
-
-[OpenStackTrace.message_fields]
-type = "OpenstackLogFile"
-logger = "%programname%"
-pid = "%pid%"
-
-#[ElseDecoder]
-#type = "PayloadRegexDecoder"
-#match_regex = '(.*)'
-
diff --git a/heka/files/decoder/salt.toml b/heka/files/decoder/salt.toml
deleted file mode 100644
index bb4ec51..0000000
--- a/heka/files/decoder/salt.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[RsyslogDecoder]
-type = "SandboxDecoder"
-filename = "lua_decoders/rsyslog.lua"
-
-[RsyslogDecoder.config]
-type = "RSYSLOG_TraditionalFileFormat"
-template = '%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n'
-tz = "Europe/Prague"
-
diff --git a/heka/files/logstreamer-rsyslog.toml b/heka/files/logstreamer-rsyslog.toml
deleted file mode 100644
index 7dbf4ae..0000000
--- a/heka/files/logstreamer-rsyslog.toml
+++ /dev/null
@@ -1,38 +0,0 @@
-[LogstreamerInputSyslog]
-type = "LogstreamerInput"
-log_directory = "/var/log"
-file_match = 'syslog\.?(?P<Index>\d+)?(.gz)?'
-priority = ["^Index"]
-decoder = "RsyslogDecoder"
-
-[LogstreamerInputAuthlog]
-type = "LogstreamerInput"
-log_directory = "/var/log"
-file_match = 'auth\.log\.?(?P<Index>\d+)?(.gz)?'
-priority = ["^Index"]
-decoder = "RsyslogDecoder"
-
-[LogstreamerInputAuthKernlog]
-type = "LogstreamerInput"
-log_directory = "/var/log"
-file_match = 'kern\.log\.?(?P<Index>\d+)?(.gz)?'
-priority = ["^Index"]
-decoder = "RsyslogDecoder"
-
-[LogstreamerInputAuthMaillog]
-type = "LogstreamerInput"
-log_directory = "/var/log"
-file_match = 'mail\.log?(?P<Index>\d+)?(.gz)?|mail\.err?(?P<Index>\d+)?(.gz)?'
-priority = ["^Index"]
-decoder = "RsyslogDecoder"
-
-[RsyslogDecoder]
-type = "SandboxDecoder"
-filename = "lua_decoders/rsyslog.lua"
-
-[RsyslogDecoder.config]
-type = "RSYSLOG_TraditionalFileFormat"
-template = '%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n'
-tz = "Europe/Prague"
-# hostname_keep = 'TRUE'
-