BS-2669: clean code while investigating possibilities