removed redundant code after last change