#690 removed redundant code