Remove unnecessary return statements

Change-Id: I92501efcb180ac92b0675bdbf25a4f33b36bfb40