Remove (some) obsolete list-filtering crud. Still need some file renames