#58 removing references to speaker