Fix speaker volume & Cleanup unused code