added XXX
removed obsolete, unreachable line