removed redudant code