Improve the cleanup and the release flow.