unnecessary code removed