Some clean up related to the entity_list changes