Added Speaker
Revert "Added Speaker"

This reverts commit 170ab64deeba1a9c19bc4cfc7af4e68208ae7134.