Revert "Entities"

This reverts commit 2c1e0517b4b31f0533d60cd840d4b8f32bdddbab.