Remove unused code
Refactor
BS-11624
Use one compound command between set value and refactor