various cleanups, notices no longer originated from self