Final cleanup for v1