Update accompaniment rendering and remove some old code