Removed redudant code