reducing now unnecessary code