TS-2344 remove handleIfRedirect() in done section