Eliminating some unnecessary code