Redudant function removed