Final cleanup for v1.1