References #1928: Initial UI for filters.  Removed/simplified API that's not being used by the implementation.

Change-Id: I85fd874869595443bc731dcf482772ba23b939ac