Remove redundant function