Fix issues from review

- Delete the TypeFilter pointers