GPII-116: removed redundant function names