Clean up FeedbackSessionsLogic #1954