Final cleanup
Fix warning