Fixed radiobuttons
Remove unnecessary code