Fix HDMI sound and remove unwanted code.