remove notify/filter and any CDB dependency
set indent variable to pass the unittests