Agreed, or should we remove it each time?