Remove notify and filter options, and all CDB dependencies