Remove unnecessary dependencies from EntityData stuff.

Change-Id: Ib3d1c6d3be078c0ca332b3ecc667685ea5e6951e