removed redundant code block