Fix concurrency issues
Remove debug line