Final cleanup for branch