Cleanup: normalize annotations, rm unused var

Change-Id: Ib46237e46318d975198017bd7088c9bbc3ae6057