Final cleanup commit