removed redundant filtering