Further tweaking.
Remove debug logs.