Add 'Remove Speaker' functionality
Code cleanup