[SWITCHYARD-2049] - Removed TCCL modification