Remove abstract stuff from EntityDiff

Change-Id: I6e2b0fc15b855025d5e6be28e096bb5e6bd322d4