Cleanup and normalise returns