Revert "Entity clean up"

This reverts commit 7e87c1b2ac9b68ec4f5c4d62efd33af20ae87068.