(OSD BRANCH) cleanup for no sound