Hygiene: Add todo notes to helpers, kill misc code

Change-Id: Iada96dfbd5793e5a8946d240651f07ecd06a44d9