CHG: remove an obsolete else statement.
REM: an obsolete cast.
REM: dead code and obsolete casts
REM: some obsolete else statements and casts
ADD: some Override annotations
ADD: an Override annotation
REM: an obsolete else statement
ADD: some Override annotations
ADD: an Override annotation