Revert "add entities"

This reverts commit 52c28ac5537d6a171bc91c712bc6fe904b2004b8.