Cleaned up queue draining thread