#FEC-1542 #comment removed redundant code