These changes fix some logic errors that were left in code, in
addition to fixing memory leak issues and removing unused
variables.
CRs-Fixed: 3394193
Change-Id: Ib257dcaf05d48913038718beca9e071730ac21c0
Signed-off-by: Atiya Kailany <quic_akailany@quicinc.com>