Remove redundant units of measure

Change-Id: Iccec16a379821742ed3d1486c54b0c8c4e959e4f
Remove unreachable statement

Change-Id: I07f035b56fab67321afb11e0148116e964a09758
Remove unnecessary colon

Change-Id: I1d41eaf04851d657202d5723177ced55469293ff