clean code, remove commented code
BS-9989: update attributes in order to keep databinding working