Removed shouldStop mechanism