REM: some obsolete casts
ADD: some Override annotations
ADD: Overide annotations
REM: obsolete else statements