Final cleanup for release