Added logic to clean up arrivals