Hygiene: remove deadbeef, fix returns

Change-Id: I2a0c3e24f56a9ace77d9381cd99e6c484ba4a5b4
Merge "Hygiene: remove deadbeef, fix returns"