Clean ups
Progressing STB
Notification array fix