Removing redundant function