Remove unnecessary fields

Removes some fields and change some info