Remove suggestions, replace with SuggestionFactory
Replace notification with NotificationFactory