Entity
Revert "Entity"

This reverts commit 2f22eeb3e78e5a271aa034bcb9bb5f5fa223d8e1.