TD-3936 (Refactoring code is unreachable issues)