dropped unnecessary code