cleanup for trivia-based APIs