remove IsValid checks as they are causing problems, and we do not seem to use IsValid to check entities anywhere else