NOREF: Cleaning up more debug messaging and implementing a better service notification mechanism