Modifying to take out the stale data paths