remove extra check