Remove some old work arounds for coverity.

Testing Done:
Compiled locally.

Reviewed at https://reviews.imfreedom.org/r/321/