Removed EntityIdSerialize where it wasn't needed.

Change-Id: Ie86d6ea7a42217ecd58020cc7178005616123973