Hygiene: Get rid of unnecessary fully qualified namespaced classnames

Change-Id: Ibf16661b1cfff9622158080b91359d88a940b67c
Hygiene: Remove unreachable code and trailing semicolon

Change-Id: I84d7c4cd302dc6ca10087d970ba22027a1682d89