Removed redundant filtering that was added