Final cleanup before v1