WTSN-55 removed TODO