remove content from notifications, clean some notification code up