Removed old destinationId stuff