diff --git a/media/media_codecs_performance.xml b/media/media_codecs_performance.xml
index c5f0599..c01a3da 100644
--- a/media/media_codecs_performance.xml
+++ b/media/media_codecs_performance.xml
@@ -33,15 +33,6 @@ limitations under the License.
             <Limit name="measured-frame-rate-1280x720" range="60-81" />
             <Limit name="measured-frame-rate-1920x1080" range="42-51" />
         </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="208-214" />
-            <Limit name="measured-frame-rate-352x288" range="50-108" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="57-208" />
-            <Limit name="measured-frame-rate-352x288" range="27-100" />
-            <Limit name="measured-frame-rate-640x480" range="75-87" />
-        </MediaCodec>
         <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="133-331" />
             <Limit name="measured-frame-rate-720x480" range="94-109" />
@@ -71,22 +62,13 @@ limitations under the License.
             <Limit name="measured-frame-rate-1280x720" range="188-203" />
             <Limit name="measured-frame-rate-1920x1080" range="95-105" />
         </MediaCodec>
-            <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
+        <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-352x288" range="235-268" />
             <Limit name="measured-frame-rate-640x360" range="242-260" />
             <Limit name="measured-frame-rate-720x480" range="236-257" />
             <Limit name="measured-frame-rate-1280x720" range="184-224" />
             <Limit name="measured-frame-rate-1920x1080" range="130-131" />
         </MediaCodec>
-        <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="186-859" />
-            <Limit name="measured-frame-rate-352x288" range="100-751" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="222-881" />
-            <Limit name="measured-frame-rate-480x360" range="109-605" />
-            <Limit name="measured-frame-rate-1280x720" range="194-356" />
-        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" update="true">
             <Limit name="measured-frame-rate-320x180" range="294-316" />
             <Limit name="measured-frame-rate-640x360" range="289-308" />
diff --git a/media/media_codecs_performance_v3.xml b/media/media_codecs_performance_v3.xml
index c96b1af..938307f 100644
--- a/media/media_codecs_performance_v3.xml
+++ b/media/media_codecs_performance_v3.xml
@@ -37,16 +37,6 @@ limitations under the License.
         <MediaCodec name="OMX.qcom.video.encoder.hevc.cq" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-320x240" range="226-226" />
         </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="60-90" />
-            <Limit name="measured-frame-rate-352x288" range="55-85" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="125-135" />
-            <Limit name="measured-frame-rate-352x288" range="55-85" />
-            <Limit name="measured-frame-rate-640x480" range="47-52" />
-            <Limit name="measured-frame-rate-1280x720" range="30-50" />
-        </MediaCodec>
         <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="124-176" />
             <Limit name="measured-frame-rate-720x480" range="53-76" />
@@ -80,7 +70,7 @@ limitations under the License.
             <Limit name="measured-frame-rate-1280x720" range="350-400" />
             <Limit name="measured-frame-rate-1920x1088" range="180-190" />
         </MediaCodec>
-            <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
+        <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-352x288" range="510-530" />
             <Limit name="measured-frame-rate-640x360" range="260-272" />
             <Limit name="measured-frame-rate-720x480" range="465-620" />
@@ -88,15 +78,6 @@ limitations under the License.
             <Limit name="measured-frame-rate-1920x1080" range="210-230" />
             <Limit name="measured-frame-rate-3840x2160" range="65-75" />
         </MediaCodec>
-        <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="830-1280" />
-            <Limit name="measured-frame-rate-352x288" range="292-292" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="418-551" />
-            <Limit name="measured-frame-rate-480x360" range="245-265" />
-            <Limit name="measured-frame-rate-1280x720" range="80-200" />
-        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" update="true">
             <Limit name="measured-frame-rate-320x240" range="377-377" />
             <Limit name="measured-frame-rate-640x360" range="323-323" />