Loading and deletion is now moved to single runs