Remove more unnecessary fields