deps: code optimization to remove if and for
Completed a TODO task. Along with that, optimised the code by removing an if and for
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Completed a TODO task. Along with that, optimised the code by removing an if and for