More changes, dumping unnecessary fields