Tidy up before rolling release