remove unused code
fix Widget-attr test to correspond to changes in ce4acef67372b9ba570f7e93e62b35f4654f907d