Cleaning filters

Change-Id: I413b935f90cebdab37d3db73d7fcb0fe77a64579
35 files changed