Eliminate redundant function