Cleanup: Get rid of several pointless returns and if statements

Change-Id: I00ee0e3b16cef60d4bf96f62768f1d3125f8300f
Merge "Cleanup: Get rid of several pointless returns and if statements"