Revert "TS-1728: Make some small cleanup as suggested."

This reverts commit 6605fa880eec5effce56c56a333236f6cbb97f72.