JC-1740 Removed redundant code.