removed useless fields, will do the entity saving system later.