Removed the needless filtering