NOTIFPLT-8:  Some clean up items