Hygiene: Remove unused function, add annotations

Change-Id: I243890ab85e7730c8abf15c71dc71c083d2a2b64
Merge "Hygiene: Remove unused function, add annotations"