Clean up code from Expanded Sound Panel