cleaning of unused code and debug
working on instant notify