diff --git a/src/main/java/io/github/dsheirer/record/RecordConfigurationEditor.java b/src/main/java/io/github/dsheirer/record/RecordConfigurationEditor.java
index 220cc33e..2abe835f 100644
--- a/src/main/java/io/github/dsheirer/record/RecordConfigurationEditor.java
+++ b/src/main/java/io/github/dsheirer/record/RecordConfigurationEditor.java
@@ -1,19 +1,17 @@
 /*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014-2016 Dennis Sheirer
+ * sdr-trunk
+ * Copyright (C) 2014-2018 Dennis Sheirer
  *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by  the Free Software Foundation, either version 3 of the License, or  (at your option) any
+ * later version.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License  along with this program.
+ * If not, see <http://www.gnu.org/licenses/>
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
  ******************************************************************************/
 package io.github.dsheirer.record;
 
@@ -39,7 +37,6 @@ public class RecordConfigurationEditor extends Editor<Channel>
 
     public RecordConfigurationEditor()
     {
-
         init();
     }
 
diff --git a/src/main/java/io/github/dsheirer/record/RecorderManager.java b/src/main/java/io/github/dsheirer/record/RecorderManager.java
index 2070c050..3622ba95 100644
--- a/src/main/java/io/github/dsheirer/record/RecorderManager.java
+++ b/src/main/java/io/github/dsheirer/record/RecorderManager.java
@@ -1,7 +1,6 @@
-/*
- * *********************************************************************************************************************
+/*******************************************************************************
  * sdr-trunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+ * Copyright (C) 2014-2018 Dennis Sheirer
  *
  * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
  * License as published by  the Free Software Foundation, either version 3 of the License, or  (at your option) any
@@ -12,8 +11,8 @@
  *
  * You should have received a copy of the GNU General Public License  along with this program.
  * If not, see <http://www.gnu.org/licenses/>
- * *********************************************************************************************************************
- */
+ *
+ ******************************************************************************/
 package io.github.dsheirer.record;
 
 import io.github.dsheirer.channel.metadata.Metadata;
@@ -240,24 +239,12 @@ public class RecorderManager implements Listener<ReusableAudioPacket>
     public ComplexBufferWaveRecorder getBasebandRecorder(String channelName)
     {
         StringBuilder sb = new StringBuilder();
-        sb.append(SystemProperties.getInstance().getApplicationFolder("recordings"));
+        sb.append(getRecordingBasePath());
         sb.append(File.separator).append(channelName).append("_baseband");
 
         return new ComplexBufferWaveRecorder(BASEBAND_SAMPLE_RATE, sb.toString());
     }
 
-    /**
-     * Constructs a baseband recorder for use in a processing chain.
-     */
-    public ComplexBufferWaveRecorder getBitstreamRecorder(String channelName)
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append(SystemProperties.getInstance().getApplicationFolder("recordings"));
-        sb.append(File.separator).append(channelName).append("_bitstream");
-
-        return new ComplexBufferWaveRecorder(BASEBAND_SAMPLE_RATE, sb.toString());
-    }
-
     /**
      * Processes queued audio packets and distributes to each of the audio recorders.  Removes any idle recorders
      * that have not been updated according to an idle threshold period