more deletions
filter_by_state added