Cleanup and audio. The real ESE build