Remove extra check