Removed old entity hack