More cleaning up of Serenade