Removes logically dead code from various locations. CRs-Fixed: 3325322 Change-Id: I2bfebbeb50cb6179bea8f02292027dab1d7f6e9b Signed-off-by: Joshua Florez <quic_jflorez@quicinc.com>