Final cleanup changes