Cleanup and remove unused use in EntitySerializer

Change-Id: I670a5b3ecb2791867647749db4726a9bc7374944
Merge "Cleanup and remove unused use in EntitySerializer"