Removed the calls to Choir, in case they were reducing stability (and no-one is listening to them anyway)