Removed redudant function