remove some unnecessary old annotation code.
Merge branch 'filters'