[misc] Improve log
Remove refactoring leftover