Cleanup for release