removed more fields