Removed unnecessary filters
COMMENT ALL THE THINGS\!