remove references to SpeakerRegistration
Kill SpeakerRegistration
Merge remove_speaker_registration and fix merge conflict
pyflakes cleanups