diff --git a/media/media_codecs.xml b/media/media_codecs.xml
index 4dee4d8..7e43970 100644
--- a/media/media_codecs.xml
+++ b/media/media_codecs.xml
@@ -89,12 +89,9 @@ Only the three quirks included above are recognized at this point:
  |_____________|_________________________________________|
  | h264        | 4096    2160    24      100      829440 |
  | hevc        | 4096    2160    24      100      829440 |
- | mpeg4-sw    | 1920    1088    30      40       244800 |
  | vp8         | 3840    2160    30      100      972000 |
  | vp9         | 4096    2160    24      100      829440 |
  | vc1         | 1920    1088    30      20       244800 |
- | div4/5/6-sw | 1920    1088    30      10       244800 |
- | h263-sw     | 864     480     30      16        48600 |
  | mpeg2       | 1920    1088    30      40       244800 |
  |_____________|_________________________________________|
 
@@ -114,9 +111,7 @@ Only the three quirks included above are recognized at this point:
  |__________|_________________________________________|
  | h264     | 4096    2160    24      100     829440  |
  | hevc     | 4096    2160    24      100     829440  |
- | mpeg4-sw | 1280     720    30      4       108000  |
  | vp8      | 3840    2160    30      100     972000  |
- | h263-sw  | 864     480     30      2       48600   |
  |__________|_________________________________________|
 -->
 
@@ -126,7 +121,6 @@ Only the three quirks included above are recognized at this point:
         <Setting name="max-video-encoder-input-buffers" value="11" />
     </Settings>
     <Encoders>
-        <!-- Video Hardware  -->
         <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
@@ -175,36 +169,8 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-1920x1080" value="120" />
             <Limit name="performance-point-1280x720" value="240" />
         </MediaCodec>
-        <!-- Video Software -->
-        <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Quirk name="requires-loaded-to-idle-after-allocation" />
-            <Limit name="size" min="32x32" max="864x480" />
-            <Limit name="alignment" value="4x4" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="48600" />
-            <Limit name="bitrate" range="1-2000000" />
-            <Limit name="frame-rate" range="1-30" />
-            <Limit name="concurrent-instances" max="16" />
-            <Limit name="performance-point-720x480" value="30" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
-             <Quirk name="requires-allocate-on-input-ports" />
-             <Quirk name="requires-allocate-on-output-ports" />
-             <Quirk name="requires-loaded-to-idle-after-allocation" />
-             <Limit name="size" min="32x32" max="1280x720" />
-             <Limit name="alignment" value="2x2" />
-             <Limit name="block-size" value="16x16" />
-             <Limit name="blocks-per-second" min="1" max="108000" />
-             <Limit name="bitrate" range="1-4000000" />
-             <Limit name="frame-rate" range="1-30" />
-             <Limit name="concurrent-instances" max="16" />
-             <Limit name="performance-point-1280x720" value="30" />
-        </MediaCodec>
     </Encoders>
     <Decoders>
-       <!-- Video Hardware  -->
         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
@@ -345,32 +311,5 @@ Only the three quirks included above are recognized at this point:
             <Limit name="performance-point-3840x2160" value="30" />
             <Limit name="performance-point-1920x1080" value="60" />
         </MediaCodec>
-        <!-- Video Software -->
-        <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="16x16" max="864x480" />
-            <Limit name="alignment" value="4x4" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="48600" />
-            <Limit name="bitrate" range="1-16000000" />
-            <Limit name="frame-rate" range="1-30" />
-            <Feature name="adaptive-playback" />
-            <Limit name="concurrent-instances" max="16" />
-            <Limit name="performance-point-720x480" value="30" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="16x16" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-40000000" />
-            <Limit name="frame-rate" range="1-30" />
-            <Limit name="concurrent-instances" max="16" />
-            <Limit name="performance-point-1920x1088" value="30" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.opus.decoder" type="audio/opus" update="true" rank="100"/>
     </Decoders>
 </MediaCodecs>
diff --git a/media/media_codecs_performance.xml b/media/media_codecs_performance.xml
index 02e5609..cff64b4 100644
--- a/media/media_codecs_performance.xml
+++ b/media/media_codecs_performance.xml
@@ -34,16 +34,6 @@ limitations under the License.
             <Limit name="measured-frame-rate-1920x1080" range="16-45" />
             <Limit name="measured-frame-rate-3840x2160" range="31-31" />
         </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.h263sw" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="200-200" />
-            <Limit name="measured-frame-rate-352x288" range="144-144" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="200-200" />
-            <Limit name="measured-frame-rate-352x288" range="144-144" />
-            <Limit name="measured-frame-rate-640x480" range="50-50" />
-            <Limit name="measured-frame-rate-1280x720" range="30-30" />
-        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="266-266" />
             <Limit name="measured-frame-rate-640x360" range="165-165" />
@@ -87,17 +77,6 @@ limitations under the License.
             <Limit name="measured-frame-rate-1920x1080" range="181-182" />
             <Limit name="measured-frame-rate-3840x2160" range="52-52" />
         </MediaCodec>
-        <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="200-400" />
-            <Limit name="measured-frame-rate-352x288" range="400-490" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es" update="true">
-           <Limit name="measured-frame-rate-176x144" range="625-688" />
-           <Limit name="measured-frame-rate-352x288" range="144-144" />
-           <Limit name="measured-frame-rate-480x360" range="346-423" />
-           <Limit name="measured-frame-rate-640x480" range="50-50" />
-           <Limit name="measured-frame-rate-1280x720" range="74-84" />
-        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x240" range="337-337" />
             <Limit name="measured-frame-rate-640x360" range="337-337" />
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 7662e8f..58868a5 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -413,48 +413,30 @@ vendor/lib64/libmeters.so
 vendor/lib64/libreffeature.so
 
 # OMX
-vendor/lib/libAlacSwDec.so
-vendor/lib/libApeSwDec.so
-vendor/lib/libFlacSwDec.so
-vendor/lib/libMpeg4SwEncoder.so
 vendor/lib/libOmxAacDec.so
 vendor/lib/libOmxAlacDec.so
-vendor/lib/libOmxAlacDecSw.so
 vendor/lib/libOmxAmrDec.so
 vendor/lib/libOmxAmrwbplusDec.so
 vendor/lib/libOmxApeDec.so
-vendor/lib/libOmxApeDecSw.so
 vendor/lib/libOmxDsdDec.so
 vendor/lib/libOmxEvrcDec.so
 vendor/lib/libOmxG711Dec.so
 vendor/lib/libOmxQcelp13Dec.so
-vendor/lib/libOmxSwVdec.so
-vendor/lib/libOmxSwVencMpeg4.so
 vendor/lib/libOmxVpp.so
 vendor/lib/libOmxWmaDec.so
 vendor/lib/libdsd2pcm.so
 vendor/lib/libmmosal.so
-vendor/lib/libswvdec.so
-vendor/lib64/libAlacSwDec.so
-vendor/lib64/libApeSwDec.so
-vendor/lib64/libFlacSwDec.so
-vendor/lib64/libMpeg4SwEncoder.so
 vendor/lib64/libOmxAacDec.so
 vendor/lib64/libOmxAlacDec.so
-vendor/lib64/libOmxAlacDecSw.so
 vendor/lib64/libOmxAmrDec.so
 vendor/lib64/libOmxAmrwbplusDec.so
 vendor/lib64/libOmxApeDec.so
-vendor/lib64/libOmxApeDecSw.so
 vendor/lib64/libOmxEvrcDec.so
 vendor/lib64/libOmxG711Dec.so
 vendor/lib64/libOmxQcelp13Dec.so
-vendor/lib64/libOmxSwVdec.so
-vendor/lib64/libOmxSwVencMpeg4.so
 vendor/lib64/libOmxVpp.so
 vendor/lib64/libOmxWmaDec.so
 vendor/lib64/libmmosal.so
-vendor/lib64/libswvdec.so
 
 # Perf
 vendor/bin/hw/vendor.qti.hardware.perf@2.2-service
diff --git a/vendor.prop b/vendor.prop
index ca84f23..2d1d81b 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -40,7 +40,6 @@ vendor.audio.feature.multi_voice_session.enable=false
 vendor.audio.feature.snd_mon.enable=true
 vendor.audio.feature.spkr_prot.enable=true
 vendor.audio.feature.usb_offload.enable=true
-vendor.audio.flac.sw.decoder.24bit=true
 vendor.audio.hal.boot.timeout.ms=20000
 vendor.audio_hal.period_size=192
 vendor.audio.hw.aac.encoder=true