Remove HDMI patch and cleanup