Remove failed attempt at eliminating static bounds on entities