Removes unnecessary enum EntityConst