Removed entity generation code