[vnc-audio-optimize] - and code cleanup