Fix Notify failures. Remove CheckGrep function (not used anymore). Update TODO