Make releases use legacy api
Tidy a few things