TS-2751: fix unused variable warnings