Added Speakerphone capability and cleaned up some unused code