Cleanup for final release