Remove superfluous return

Return is unnecessary as the last statement in a function with no return
value.

Change-Id: Id9d24353e7ca9848dcd067a0ca5db2fc2eeb0a75