add filtering deleted some out of date code