Hygiene: Remove redundant returns

Change-Id: I9c8fd16e5ddd8bf62b1c2ef931b70f41d116cd41