Removed unnecessary filters