Removed the filters that were evolutionary holdovers in the code