Remove excess check