Cleanup; Fixed the re-enqueueing in the Consumer;