Remove some traces of SermonSpeaker