Improved RadioButton removal behavior