diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java
index c52ebf3aa..0cfd856e1 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java
@@ -15,7 +15,6 @@ import java.util.NoSuchElementException;
  */
 public class Mp4DashReader {
 
-    // <editor-fold defaultState="collapsed" desc="Constants">
     private static final int ATOM_MOOF = 0x6D6F6F66;
     private static final int ATOM_MFHD = 0x6D666864;
     private static final int ATOM_TRAF = 0x74726166;
@@ -50,7 +49,7 @@ public class Mp4DashReader {
     private static final int HANDLER_VIDE = 0x76696465;
     private static final int HANDLER_SOUN = 0x736F756E;
     private static final int HANDLER_SUBT = 0x73756274;
-    // </editor-fold>
+
 
     private final DataReader stream;
 
@@ -293,7 +292,8 @@ public class Mp4DashReader {
         return null;
     }
 
-    // <editor-fold defaultState="collapsed" desc="Utils">
+
+
     private long readUint() throws IOException {
         return stream.readInt() & 0xffffffffL;
     }
@@ -392,9 +392,7 @@ public class Mp4DashReader {
         return readBox();
     }
 
-    // </editor-fold>
 
-    // <editor-fold defaultState="collapsed" desc="Box readers">
 
     private Moof parse_moof(Box ref, int trackId) throws IOException {
         Moof obj = new Moof();
@@ -795,9 +793,8 @@ public class Mp4DashReader {
         return readFullBox(b);
     }
 
-    // </editor-fold>
 
-    // <editor-fold defaultState="collapsed" desc="Helper classes">
+
     class Box {
 
         int type;
@@ -1013,5 +1010,5 @@ public class Mp4DashReader {
         public TrunEntry info;
         public byte[] data;
     }
-//</editor-fold>
+
 }
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
index 420f77955..818f6148e 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -161,7 +161,7 @@ public class Mp4FromDashWriter {
 
         boolean singleChunk = tracks.length == 1 && tracks[0].kind == TrackKind.Audio;
 
-        //<editor-fold defaultstate="expanded" desc="calculate stbl sample tables size and required moov values">
+
         for (int i = 0; i < readers.length; i++) {
             int samplesSize = 0;
             int sampleSizeChanges = 0;
@@ -255,7 +255,7 @@ public class Mp4FromDashWriter {
                 tracks[i].trak.tkhd.duration = sampleExtra[i];// this never should happen
             }
         }
-        //</editor-fold>
+
 
         boolean is64 = read > THRESHOLD_FOR_CO64;
 
@@ -426,7 +426,7 @@ public class Mp4FromDashWriter {
         }
     }
 
-    // <editor-fold defaultstate="expanded" desc="Stbl handling">
+
     private int writeEntry64(int offset, long value) throws IOException {
         outBackup();
 
@@ -469,9 +469,9 @@ public class Mp4FromDashWriter {
             lastWriteOffset = -1;
         }
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="expanded" desc="Utils">
+
+
     private void outWrite(byte[] buffer) throws IOException {
         outWrite(buffer, buffer.length);
     }
@@ -581,9 +581,9 @@ public class Mp4FromDashWriter {
     private int auxOffset() {
         return auxBuffer == null ? (int) writeOffset : auxBuffer.position();
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="expanded" desc="Box makers">
+
+
     private int make_ftyp() throws IOException {
         byte[] buffer = new byte[]{
                 0x00, 0x00, 0x00, 0x1C, 0x66, 0x74, 0x79, 0x70,// ftyp
@@ -815,7 +815,7 @@ public class Mp4FromDashWriter {
 
         return buffer.array();
     }
-    //</editor-fold>
+
 
     class TablesInfo {
 
diff --git a/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java
index 37bf9c6d7..20e88c4c7 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java
@@ -308,7 +308,8 @@ public class OggFromWebMWriter implements Closeable {
         buffer.position(0);
     }
 
-    //<editor-fold defaultstate="collapsed" desc="WebM track handling">
+
+
     @Nullable
     private SimpleBlock getNextBlock() throws IOException {
         SimpleBlock res;
@@ -359,9 +360,7 @@ public class OggFromWebMWriter implements Closeable {
 
         return 0f;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Segment table writing">
     private void clearSegmentTable() {
         segment_table_next_timestamp += TIME_SCALE_NS;
         packet_flag = FLAG_UNSET;
@@ -407,9 +406,7 @@ public class OggFromWebMWriter implements Closeable {
 
         return true;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Checksum CRC32">
     private void populate_crc32_table() {
         for (int i = 0; i < 0x100; i++) {
             int crc = i << 24;
@@ -430,5 +427,5 @@ public class OggFromWebMWriter implements Closeable {
 
         return initial_crc;
     }
-    //</editor-fold>
+
 }
diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMReader.java b/app/src/main/java/org/schabi/newpipe/streams/WebMReader.java
index 4cb96d901..42875c364 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/WebMReader.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/WebMReader.java
@@ -15,7 +15,6 @@ import java.util.NoSuchElementException;
  */
 public class WebMReader {
 
-    //<editor-fold defaultstate="collapsed" desc="constants">
     private final static int ID_EMBL = 0x0A45DFA3;
     private final static int ID_EMBLReadVersion = 0x02F7;
     private final static int ID_EMBLDocType = 0x0282;
@@ -44,7 +43,7 @@ public class WebMReader {
     private final static int ID_SimpleBlock = 0x23;
     private final static int ID_Block = 0x21;
     private final static int ID_GroupBlock = 0x20;
-//</editor-fold>
+
 
     public enum TrackKind {
         Audio/*2*/, Video/*1*/, Other
@@ -110,7 +109,8 @@ public class WebMReader {
         return segment;
     }
 
-    //<editor-fold defaultstate="collapsed" desc="utils">
+
+
     private long readNumber(Element parent) throws IOException {
         int length = (int) parent.contentSize;
         long value = 0;
@@ -225,9 +225,9 @@ public class WebMReader {
 
         stream.skipBytes(skip);
     }
-//</editor-fold>
 
-    //<editor-fold defaultState="collapsed" desc="elements readers">
+
+
     private boolean readEbml(Element ref, int minReadVersion, int minDocTypeVersion) throws IOException {
         Element elem = untilElement(ref, ID_EMBLReadVersion);
         if (elem == null) {
@@ -389,9 +389,9 @@ public class WebMReader {
 
         return obj;
     }
-//</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="class helpers">
+
+
     class Element {
 
         int type;
@@ -536,5 +536,5 @@ public class WebMReader {
         }
 
     }
-//</editor-fold>
+
 }