Cleaned up tasks to avoid sends out of order