Remove overflow guard