Remove deprecated affinity filters

Remove affinity filters that were previously deprecated. Filters
originally deprecated in 2bca0c9011d9868aff3e80f4f6f432d29f07adf6

Change-Id: I5f642988dbd35e02e13dd13c69c6625cf9b07237
Merge "Remove deprecated affinity filters"