Improve logging
Remove queue