cleared unnecessary code