Remove voice selection. Need more robust system for this