Merge "Cleaning up some unused notifications functionality" into main