integrated notifications -  now working

 also cleaned up unused code.