Removed unnecessary state conditional filters