cleaned up Notification and NotificationKey models